From 3b7bb814ca4ed324690f27d4923efa9888f905cb Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 3 May 2005 17:24:41 +0000 Subject: [PATCH] bitkeeper revision 1.1389.5.3 (4277b3d9n4kOkJhg5l2rwlVwgxfYBg) New files in sparse tree are made via 'obj-y' variable, not 'c-obj-y'. Signed-off-by: Keir Fraser --- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile | 4 ++-- linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile index 11934c626d..48cbb6ddd0 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile @@ -29,10 +29,10 @@ obj-$(CONFIG_MICROCODE) += microcode.o c-obj-$(CONFIG_APM) += apm.o obj-$(CONFIG_X86_SMP) += smp.o smpboot.o #obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o -c-obj-$(CONFIG_X86_MPPARSE) += mpparse.o +obj-$(CONFIG_X86_MPPARSE) += mpparse.o obj-$(CONFIG_X86_LOCAL_APIC) += apic.o c-obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o -c-obj-$(CONFIG_X86_IO_APIC) += io_apic.o +obj-$(CONFIG_X86_IO_APIC) += io_apic.o c-obj-$(CONFIG_X86_NUMAQ) += numaq.o c-obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o c-obj-$(CONFIG_MODULES) += module.o diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile index 2b658dbd1c..a606c3335b 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile @@ -11,7 +11,7 @@ c-obj-$(CONFIG_PCI_DIRECT) += direct.o c-pci-y := fixup.o c-pci-$(CONFIG_ACPI_PCI) += acpi.o c-pci-y += legacy.o -c-pci-y += irq.o +pci-y += irq.o c-pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_VISWS) := -- 2.30.2